[automated] Merge branch 'release/6.0' => 'release/6.0-staging' #99584

dotnet-maestro-bot · 2024-03-12T06:36:10Z

I detected changes in the release/6.0 branch which have not been merged yet to release/6.0-staging. I'm a robot and am configured to help you automatically keep release/6.0-staging up to date, so I've opened this PR.

This PR merges commits made on release/6.0 by the following committers:

carlossanlop

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/6.0
git pull --ff-only
git checkout release/6.0-staging
git pull --ff-only
git merge --no-ff release/6.0

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/6.0-to-release/6.0-staging

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-to-release/6.0-staging

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/6.0-to-release/6.0-staging'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/6.0-to-release/6.0-staging release/6.0-staging
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/6.0-to-release/6.0-staging
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/6.0-to-release/6.0-staging

or if you are using SSH

git checkout -b merge/release/6.0-to-release/6.0-staging release/6.0-staging
git pull [email protected]:dotnet-maestro-bot/runtime merge/release/6.0-to-release/6.0-staging
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-to-release/6.0-staging

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

[manual] Merge release/6.0-staging into release/6.0

dotnet-policy-service · 2024-03-12T06:36:31Z

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

dotnet-policy-service · 2024-03-12T06:36:31Z

Tagging subscribers to 'linkable-framework': @eerhardt, @vitek-karas, @LakshanF, @sbomer, @joperezr, @marek-safar
See info in area-owners.md if you want to be subscribed.

…-merge-6.0-2024-03-12-1049

….0-2024-03-12-1049 Merging internal commits for release/6.0

…sts failure on reattempts. (dotnet#99710)

…et#99693) Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.24113.1 -> To Version 6.0.0-beta.24162.4 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: vseanreesermsft <[email protected]>

…t#99717) Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.28 -> To Version 6.0.28 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Carlos Sánchez López <[email protected]>

…et#99785) Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.24162.4 -> To Version 6.0.0-beta.24163.13 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

…tnet#99787) Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 6.0.0-prerelease.23531.3 -> To Version 6.0.0-prerelease.24154.4 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

Apple changed the error code we get back from a failed data-key export. This caused us to not attempt to export the key using the legacy APIs and assume the key export failed. This change adds the additional error code returned from macOS 14.4. Co-authored-by: Kevin Jones <[email protected]>

…t#100049) Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.28 -> To Version 6.0.29 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

…-merge-6.0-2024-04-09-1222

…6.0-2024-04-09-1222 Merging internal commits for release/6.0

dotnet-bot and others added 10 commits February 7, 2024 00:39

Merge in 'release/6.0' changes

da64034

Merge in 'release/6.0' changes

6eed0b5

Merge in 'release/6.0' changes

5d304be

Merge in 'release/6.0' changes

30ca91d

Merge in 'release/6.0' changes

b218d15

Merge in 'release/6.0' changes

b3e4fee

Merge in 'release/6.0' changes

2b3cfc7

Merge in 'release/6.0' changes

34a1091

Merge in 'release/6.0' changes

a1088fb

Merge pull request dotnet#99577 from carlossanlop/release/6.0-staging

6a9355b

[manual] Merge release/6.0-staging into release/6.0

dotnet-issue-labeler bot added the area-Infrastructure-libraries label Mar 12, 2024

dotnet-policy-service bot added the linkable-framework Issues associated with delivering a linker friendly framework label Mar 12, 2024

dotnet-bot and others added 13 commits March 12, 2024 06:43

Merge in 'release/6.0' changes

a6f7847

Merge commit '34a109148c7d8a2c8e6431e83e4bce5712dd8083' into internal…

be71b0b

…-merge-6.0-2024-03-12-1049

Merge pull request dotnet#99625 from vseanreesermsft/internal-merge-6…

19b190f

….0-2024-03-12-1049 Merging internal commits for release/6.0

Merge in 'release/6.0' changes

1d02447

Append job attempt number to log artifact name to get rid of file exi…

9a79d40

…sts failure on reattempts. (dotnet#99710)

Merge in 'release/6.0' changes

6724b17

Merge in 'release/6.0' changes

1b1e390

Merge in 'release/6.0' changes

c974f79

Merge in 'release/6.0' changes

01f15d4

build-analysis bot mentioned this pull request Mar 15, 2024

The system cannot open the device or file specified 'NuGet-Migrations' #91987

Open

vseanreesermsft and others added 2 commits March 19, 2024 14:43

Merge in 'release/6.0' changes

c95b683

This was referenced Mar 20, 2024

Tracking issue for CI build timeouts #76454

Closed

slow macOS - "##[error]The job running on agent Azure Pipelines 9 ran longer than the maximum time of 60 minutes." dotnet/dnceng#1883

Open

dotnet-maestro bot and others added 2 commits March 21, 2024 09:36

Merge in 'release/6.0' changes

189fbbd

build-analysis bot mentioned this pull request Mar 21, 2024

[6.0] GC test failures: Handle collector count overflows or underflows #81383

Open

carlossanlop added Servicing-approved Approved for servicing release area-codeflow for labeling automated codeflow and removed area-Infrastructure-libraries linkable-framework Issues associated with delivering a linker friendly framework labels Mar 25, 2024

carlossanlop approved these changes Mar 25, 2024

View reviewed changes

Update branding to 6.0.30 (dotnet#100545)

52a5f97

build-analysis bot mentioned this pull request Apr 3, 2024

System.IO.Net5Compat.Tests and System.IO.Tests suddenly exiting with error 137 #100558

Open

vseanreesermsft and others added 2 commits April 9, 2024 12:24

Merge commit '189fbbd88d97dd6d65515ba2da05b62eab4e5039' into internal…

95ae44e

…-merge-6.0-2024-04-09-1222

Merge pull request dotnet#100837 from vseanreesermsft/internal-merge-…

796e082

…6.0-2024-04-09-1222 Merging internal commits for release/6.0

ericstj merged commit 0e7d0c9 into dotnet:release/6.0-staging Apr 12, 2024
167 of 181 checks passed

github-actions bot locked and limited conversation to collaborators May 12, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[automated] Merge branch 'release/6.0' => 'release/6.0-staging' #99584

[automated] Merge branch 'release/6.0' => 'release/6.0-staging' #99584

dotnet-maestro-bot commented Mar 12, 2024

dotnet-policy-service bot commented Mar 12, 2024

dotnet-policy-service bot commented Mar 12, 2024

[automated] Merge branch 'release/6.0' => 'release/6.0-staging' #99584

[automated] Merge branch 'release/6.0' => 'release/6.0-staging' #99584

Conversation

dotnet-maestro-bot commented Mar 12, 2024

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

dotnet-policy-service bot commented Mar 12, 2024

dotnet-policy-service bot commented Mar 12, 2024